diff --git a/users/common/default.nix b/users/common/default.nix
new file mode 100644
index 0000000..a6eeaf4
--- /dev/null
+++ b/users/common/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./home.nix
+    ./programs.nix
+  ];
+}
diff --git a/users/desktops/common/default.nix b/users/desktops/common/default.nix
new file mode 100644
index 0000000..35e3fc5
--- /dev/null
+++ b/users/desktops/common/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./home.nix
+    ./programs.nix
+    ./services.nix
+  ];
+}
diff --git a/users/desktops/user.nix b/users/desktops/user.nix
index 4f50b45..e79e317 100644
--- a/users/desktops/user.nix
+++ b/users/desktops/user.nix
@@ -3,11 +3,8 @@
 {
   imports = [
     # Host-common imports
-    ../common/programs.nix
-    ../common/home.nix
+    ../common
     # Desktop-common imports
-    ./common/programs.nix
-    ./common/services.nix
-    ./common/home.nix
+    ./common
   ];
 }
diff --git a/users/servers/user.nix b/users/servers/user.nix
index 8b8c81b..0b27563 100644
--- a/users/servers/user.nix
+++ b/users/servers/user.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     # Host-common imports
-    ../common/programs.nix
-    ../common/home.nix
+    ../common
   ];
 }