diff --git a/flake/hosts.nix b/flake/hosts.nix
index 05c7951..c26b3a2 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -15,12 +15,21 @@ let
             "${self}/hosts/${hostName}"
             |> lib.filesystem.listFilesRecursive
             |> lib.filter (lib.hasSuffix ".nix");
+
+          userFiles =
+            "${self}/users"
+            |> builtins.readDir
+            |> lib.filterAttrs (_: type: type == "directory")
+            |> builtins.attrNames
+            |> map (user: "${self}/users/${user}/@${hostName}")
+            |> builtins.filter (path: builtins.pathExists path);
         in
         [
           { networking = { inherit hostName; }; }
           "${self}/hosts/shared.nix"
         ]
-        ++ hostFiles;
+        ++ hostFiles
+        ++ userFiles;
     };
 
   mkDeployNode = hostname: {
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index c39fc78..5d97523 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -8,15 +8,11 @@
       enable = true;
       agePublicKey = "age18x6herevmcuhcmeh47ll6p9ck9zk4ga6gfxwlc8yl49rwjxm7qusylwfgc";
     };
+
     boot = {
       loader.systemd-boot.enable = true;
       silent = true;
     };
-    users.seb = {
-      enable = true;
-      zsh.enable = true;
-      homeManager.enable = true;
-    };
 
     dm.tuigreet = {
       enable = true;
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 5d2d25f..a9f271a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -8,15 +8,11 @@
       enable = true;
       agePublicKey = "age1sywwrwse76x8yskrsfpwk38fu2cmyx5s9qkf2pgc68cta0vj9psql7dp6e";
     };
+
     boot = {
       loader.systemd-boot.enable = true;
       silent = true;
     };
-    users.seb = {
-      enable = true;
-      zsh.enable = true;
-      homeManager.enable = true;
-    };
 
     dm.tuigreet = {
       enable = true;
diff --git a/hosts/srv-external/default.nix b/hosts/srv-external/default.nix
index 81e5120..3bf0b51 100644
--- a/hosts/srv-external/default.nix
+++ b/hosts/srv-external/default.nix
@@ -12,8 +12,8 @@
       enable = true;
       agePublicKey = "age1dnpwfwh0h95r63e5qfjc2gvffw2tr2tx4new7sq2h3qs90kx9fmq322mx4";
     };
+
     boot.loader.grub.enable = true;
-    users.seb.enable = true;
 
     services = {
       resolved.enable = true;
diff --git a/hosts/srv-internal/default.nix b/hosts/srv-internal/default.nix
index 90a6912..f4db63e 100644
--- a/hosts/srv-internal/default.nix
+++ b/hosts/srv-internal/default.nix
@@ -12,8 +12,8 @@
       enable = true;
       agePublicKey = "age1qz04yg4h4g22wxqca2pd5k0z574223f6m5c9jy5ny37nlgcd6u4styf06t";
     };
+
     boot.loader.systemd-boot.enable = true;
-    users.seb.enable = true;
 
     services = {
       resolved.enable = true;
diff --git a/hosts/srv-monitor/default.nix b/hosts/srv-monitor/default.nix
index c8b334c..9129c74 100644
--- a/hosts/srv-monitor/default.nix
+++ b/hosts/srv-monitor/default.nix
@@ -17,8 +17,8 @@
       enable = true;
       agePublicKey = "age1dnru7l0agvnw3t9kmx60u4vh5u4tyd49xdve53zspxkznnp9f34qtec9dl";
     };
+
     boot.loader.grub.enable = true;
-    users.seb.enable = true;
 
     services = {
       resolved.enable = true;
diff --git a/modules/system/users/seb.nix b/modules/system/users/seb.nix
deleted file mode 100644
index d7c430e..0000000
--- a/modules/system/users/seb.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  config,
-  inputs,
-  self,
-  pkgs,
-  pkgs-unstable,
-  lib,
-  ...
-}:
-let
-  cfg = config.custom.users.seb;
-in
-{
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  options.custom.users.seb = {
-    enable = lib.mkEnableOption "";
-    zsh.enable = lib.mkEnableOption "";
-    homeManager = {
-      enable = lib.mkEnableOption "";
-      configPaths = lib.mkOption {
-        type = lib.types.listOf lib.types.path;
-        default = [
-          "${self}/users/shared-home.nix"
-          "${self}/users/seb/home.nix"
-          "${self}/users/seb/@${config.networking.hostName}/home.nix"
-        ];
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable (
-    lib.mkMerge [
-      {
-        sops.secrets."seb-password".neededForUsers = true;
-
-        users.users.seb = {
-          isNormalUser = true;
-          description = "Sebastian Stork";
-          hashedPasswordFile = config.sops.secrets."seb-password".path;
-          extraGroups = [ "wheel" ];
-          shell = lib.mkIf cfg.zsh.enable pkgs.zsh;
-        };
-
-        programs.zsh.enable = lib.mkIf cfg.zsh.enable true;
-      }
-
-      (lib.mkIf cfg.homeManager.enable {
-        home-manager = {
-          useGlobalPkgs = true;
-          useUserPackages = true;
-          extraSpecialArgs = {
-            inherit inputs self pkgs-unstable;
-          };
-
-          users.seb.imports = cfg.homeManager.configPaths;
-        };
-      })
-    ]
-  );
-}
diff --git a/users/home-manager.nix b/users/home-manager.nix
new file mode 100644
index 0000000..8a5bbe5
--- /dev/null
+++ b/users/home-manager.nix
@@ -0,0 +1,17 @@
+{
+  inputs,
+  self,
+  pkgs-unstable,
+  ...
+}:
+{
+  imports = [ inputs.home-manager.nixosModules.home-manager ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs self pkgs-unstable;
+    };
+  };
+}
diff --git a/users/seb/@desktop/default.nix b/users/seb/@desktop/default.nix
new file mode 100644
index 0000000..6e5d69c
--- /dev/null
+++ b/users/seb/@desktop/default.nix
@@ -0,0 +1,12 @@
+{ self, pkgs, ... }:
+{
+  imports = [
+    ../user.nix
+    "${self}/users/home-manager.nix"
+  ];
+
+  users.users.seb.shell = pkgs.zsh;
+  programs.zsh.enable = true;
+
+  home-manager.users.seb = ./home.nix;
+}
diff --git a/users/seb/@laptop/default.nix b/users/seb/@laptop/default.nix
new file mode 100644
index 0000000..6e5d69c
--- /dev/null
+++ b/users/seb/@laptop/default.nix
@@ -0,0 +1,12 @@
+{ self, pkgs, ... }:
+{
+  imports = [
+    ../user.nix
+    "${self}/users/home-manager.nix"
+  ];
+
+  users.users.seb.shell = pkgs.zsh;
+  programs.zsh.enable = true;
+
+  home-manager.users.seb = ./home.nix;
+}
diff --git a/users/seb/@srv-external/default.nix b/users/seb/@srv-external/default.nix
new file mode 100644
index 0000000..08963de
--- /dev/null
+++ b/users/seb/@srv-external/default.nix
@@ -0,0 +1 @@
+_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/@srv-internal/default.nix b/users/seb/@srv-internal/default.nix
new file mode 100644
index 0000000..08963de
--- /dev/null
+++ b/users/seb/@srv-internal/default.nix
@@ -0,0 +1 @@
+_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/@srv-monitor/default.nix b/users/seb/@srv-monitor/default.nix
new file mode 100644
index 0000000..08963de
--- /dev/null
+++ b/users/seb/@srv-monitor/default.nix
@@ -0,0 +1 @@
+_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/home.nix b/users/seb/home.nix
index dd57a48..de33bed 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  imports = [ ../shared-home.nix ];
+
   home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config";
 
   custom = {
diff --git a/users/seb/user.nix b/users/seb/user.nix
new file mode 100644
index 0000000..8ea413f
--- /dev/null
+++ b/users/seb/user.nix
@@ -0,0 +1,11 @@
+{ config, ... }:
+{
+  sops.secrets."seb-password".neededForUsers = true;
+
+  users.users.seb = {
+    isNormalUser = true;
+    description = "Sebastian Stork";
+    hashedPasswordFile = config.sops.secrets."seb-password".path;
+    extraGroups = [ "wheel" ];
+  };
+}