diff --git a/modules/features/host-base.nix b/modules/features/host-base.nix
index 660f61b..9c85a9e 100644
--- a/modules/features/host-base.nix
+++ b/modules/features/host-base.nix
@@ -11,9 +11,9 @@ in
     imports = [
       nixosModules.meta
       inputs.home-manager.nixosModules.home-manager
-      nixosModules.ai
       nixosModules.nix
       nixosModules.region-nl
+      nixosModules.sops-password
     ];
 
     home-manager = {
@@ -22,6 +22,8 @@ in
       extraSpecialArgs = { inherit inputs; };
     };
 
+    users.mutableUsers = false;
+
     security.sudo.extraConfig = ''
       Defaults env_keep+=SSH_AUTH_SOCK
     '';
diff --git a/modules/features/workstation-base.nix b/modules/features/workstation-base.nix
index 3f72127..389fe18 100644
--- a/modules/features/workstation-base.nix
+++ b/modules/features/workstation-base.nix
@@ -17,15 +17,13 @@ in
       nixosModules.niri
       nixosModules.plymouth
       nixosModules.printing
-      nixosModules.sops-password
       nixosModules.sddm
       nixosModules.sops-admin-key-file
       nixosModules.standard-boot
       nixosModules.theme
+      nixosModules.ai
     ];
 
-    users.mutableUsers = false;
-
     services.dbus.implementation = "broker";
 
     programs.nix-ld.enable = true;