diff --git a/flake-parts/hosts.nix b/flake-parts/hosts.nix
index 687cef5..620f491 100644
--- a/flake-parts/hosts.nix
+++ b/flake-parts/hosts.nix
@@ -21,12 +21,13 @@ let
             |> builtins.readDir
             |> lib.filterAttrs (_: type: type == "directory")
             |> lib.attrNames
-            |> map (user: "${self}/users/${user}/@${hostName}")
+            |> map (user: "${self}/users/${user}/@${hostName}/default.nix")
             |> lib.filter (path: lib.pathExists path);
         in
         [
           { networking = { inherit hostName; }; }
           "${self}/hosts/common.nix"
+          "${self}/users/seb/default.nix"
         ]
         ++ hostFiles
         ++ userFiles;
diff --git a/users/common-home.nix b/users/common-home.nix
deleted file mode 100644
index 5b14faa..0000000
--- a/users/common-home.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, self, ... }:
-{
-  imports = [ self.homeManagerModules.default ];
-
-  xdg = {
-    enable = true;
-    userDirs = {
-      enable = true;
-      createDirectories = true;
-      extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
-    };
-  };
-}
diff --git a/users/seb/@desktop/default.nix b/users/seb/@desktop/default.nix
index 6e5d69c..1de054e 100644
--- a/users/seb/@desktop/default.nix
+++ b/users/seb/@desktop/default.nix
@@ -1,12 +1,8 @@
 { self, pkgs, ... }:
 {
-  imports = [
-    ../user.nix
-    "${self}/users/home-manager.nix"
-  ];
+  imports = [ "${self}/users/home-manager.nix" ];
+  home-manager.users.seb = ./home.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
index 6e5d69c..1de054e 100644
--- a/users/seb/@laptop/default.nix
+++ b/users/seb/@laptop/default.nix
@@ -1,12 +1,8 @@
 { self, pkgs, ... }:
 {
-  imports = [
-    ../user.nix
-    "${self}/users/home-manager.nix"
-  ];
+  imports = [ "${self}/users/home-manager.nix" ];
+  home-manager.users.seb = ./home.nix;
 
   users.users.seb.shell = pkgs.zsh;
   programs.zsh.enable = true;
-
-  home-manager.users.seb = ./home.nix;
 }
diff --git a/users/seb/@srv-monitor/default.nix b/users/seb/@srv-monitor/default.nix
deleted file mode 100644
index 08963de..0000000
--- a/users/seb/@srv-monitor/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/@srv-private/default.nix b/users/seb/@srv-private/default.nix
deleted file mode 100644
index 08963de..0000000
--- a/users/seb/@srv-private/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/@srv-public/default.nix b/users/seb/@srv-public/default.nix
deleted file mode 100644
index 08963de..0000000
--- a/users/seb/@srv-public/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ../user.nix ]; }
diff --git a/users/seb/user.nix b/users/seb/default.nix
similarity index 100%
rename from users/seb/user.nix
rename to users/seb/default.nix
diff --git a/users/seb/home.nix b/users/seb/home.nix
index cd42adf..802bc95 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -1,6 +1,20 @@
-{ pkgs, ... }:
 {
-  imports = [ ../common-home.nix ];
+  config,
+  self,
+  pkgs,
+  ...
+}:
+{
+  imports = [ self.homeManagerModules.default ];
+
+  xdg = {
+    enable = true;
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+      extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
+    };
+  };
 
   home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config";