diff --git a/flake.nix b/flake.nix
index 0a0d88a..a8c44d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,7 @@
         modules = [
           ./src/system/machines/server
           home-manager.nixosModules.home-manager
-            (import ./src/system/machines/server/home.nix)
+            (import ./src/system/machines/server/modules/home-manager)
         ];
       };
 
diff --git a/src/system/machines/server/modules/default.nix b/src/system/machines/server/modules/default.nix
new file mode 100644
index 0000000..1649694
--- /dev/null
+++ b/src/system/machines/server/modules/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./home
+  ];
+}
diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/modules/home-manager/default.nix
similarity index 94%
rename from src/system/machines/server/home.nix
rename to src/system/machines/server/modules/home-manager/default.nix
index 707a63c..b605bad 100644
--- a/src/system/machines/server/home.nix
+++ b/src/system/machines/server/modules/home-manager/default.nix
@@ -4,7 +4,7 @@
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.${config.user.name} = {
-    imports = [ ../../../user ];
+    imports = [ ../../../../../user ];
 
     programs.home-manager.enable = true;
     programs.bash.shellAliases = {