diff --git a/modules/nixos/system/network/wireguard/default.nix b/modules/nixos/system/network/wireguard/default.nix
index 95356a5..a39b81a 100644
--- a/modules/nixos/system/network/wireguard/default.nix
+++ b/modules/nixos/system/network/wireguard/default.nix
@@ -18,7 +18,7 @@ in
           listenPort = 1515;
           mtu = 1340;
           peers = 
-            if config.syscfg.server ? wireguard then
+            if config.syscfg.server.wireguard then
               map (p: {
                 name = p.syscfg.hostname;
                 publicKey = p.syscfg.net.wg.pubkey;
diff --git a/modules/server/arion/default.nix b/modules/server/arion/default.nix
index b9f4ee2..92356b0 100644
--- a/modules/server/arion/default.nix
+++ b/modules/server/arion/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:{
-  config = lib.mkIf (config.syscfg.server ? arion) {
+  config = lib.mkIf (config.syscfg.server.arion) {
     environment.systemPackages = with pkgs; [ arion ];
     virtualisation.arion = {
       backend = "podman-socket";
diff --git a/modules/server/nftables/default.nix b/modules/server/nftables/default.nix
index b5a84a3..d35df24 100644
--- a/modules/server/nftables/default.nix
+++ b/modules/server/nftables/default.nix
@@ -1,7 +1,7 @@
 
 
 { config, lib, ... }:{
-  config = lib.mkIf (config.syscfg.server ? nftables.enable) {
+  config = lib.mkIf (config.syscfg.server.nftables.enable) {
     boot.kernel.sysctl = {
       "net.ipv4.ip_forward" = 1;
       "net.ipv6.conf.all.forwarding" = 1;
diff --git a/modules/server/openssh/default.nix b/modules/server/openssh/default.nix
index 1fdf8f2..ba7f2be 100644
--- a/modules/server/openssh/default.nix
+++ b/modules/server/openssh/default.nix
@@ -5,7 +5,7 @@ let
   allowedUsernames = map (u: u.username) config.syscfg.users;
   activeUsers = lib.filterAttrs (name: _: lib.elem name allowedUsernames) groupedUsers;
 in {
-  config = lib.mkIf (config.syscfg.server ? openssh) {
+  config = lib.mkIf (config.syscfg.server.openssh) {
     services.openssh = {
         enable = true;
         ports = [ 422 ];
diff --git a/modules/server/sops/default.nix b/modules/server/sops/default.nix
index 6aecf7c..fb7379f 100644
--- a/modules/server/sops/default.nix
+++ b/modules/server/sops/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-  config = lib.mkIf (config.syscfg.server ? sops) {
+  config = lib.mkIf (config.syscfg.server.sops) {
     sops.secrets.INFOMANIAK_API_KEY = { sopsFile = ./server.yaml; };
   };
 }