diff --git a/flake.nix b/flake.nix
index d4e05af..6563945 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,7 @@
       user = "root";
       sshUser = "root";
       nodes = {
-        "alexandria" = {
+        alexandria = {
           hostname = "alexandria";
           profiles.system = {
             remoteBuild = true;
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
new file mode 100644
index 0000000..997382e
--- /dev/null
+++ b/hosts/common/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  imports = [
+    ./boot.nix
+    ./locale.nix
+    ./networking.nix
+    ./nix.nix
+    ./packages.nix
+    ./services.nix
+    ./users.nix
+  ];
+}
diff --git a/hosts/desktops/common/default.nix b/hosts/desktops/common/default.nix
new file mode 100644
index 0000000..ac2bf25
--- /dev/null
+++ b/hosts/desktops/common/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  imports = [
+    ./boot.nix
+    ./hardware.nix
+    ./nix.nix
+    ./packages.nix
+    ./services.nix
+    ./users.nix
+    ./virtualisation.nix
+  ];
+}
diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix
index 0ff2793..6221770 100644
--- a/hosts/desktops/io.nix
+++ b/hosts/desktops/io.nix
@@ -2,24 +2,12 @@
 
 {
   imports = [ 
-    # Host-specific imports
-    ./io/hardware-configuration.nix
     # Host-common imports
-    ../common/networking.nix
-    ../common/services.nix
-    ../common/packages.nix
-    ../common/locale.nix
-    ../common/users.nix
-    ../common/boot.nix
-    ../common/nix.nix
+    ../common
     # Desktop-common imports
-    ./common/virtualisation.nix
-    ./common/hardware.nix
-    ./common/services.nix
-    ./common/packages.nix
-    ./common/users.nix
-    ./common/boot.nix
-    ./common/nix.nix
+    ./common
+    # Host-specific imports
+    ./io
   ];
 
   networking.hostName = "io";
diff --git a/hosts/desktops/io/default.nix b/hosts/desktops/io/default.nix
new file mode 100644
index 0000000..a166058
--- /dev/null
+++ b/hosts/desktops/io/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+}
diff --git a/hosts/servers/alexandria.nix b/hosts/servers/alexandria.nix
index 2487b26..f86c924 100644
--- a/hosts/servers/alexandria.nix
+++ b/hosts/servers/alexandria.nix
@@ -2,20 +2,12 @@
 
 {
   imports = [
-    # Host-specific imports
-    ./alexandria/hardware-configuration.nix
-    ./alexandria/hosted-services.nix
     # Host-common imports
-    ../common/networking.nix
-    ../common/packages.nix
-    ../common/services.nix
-    ../common/locale.nix
-    ../common/users.nix
-    ../common/boot.nix
-    ../common/nix.nix
+    ../common
     # Server-common imports
-    ./common/boot.nix
-    ./common/nix.nix
+    ./common
+    # Host-specific imports
+    ./alexandria
   ];
 
   users.users.user.extraGroups = [ "docker" ];
diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix
new file mode 100644
index 0000000..7ba884b
--- /dev/null
+++ b/hosts/servers/alexandria/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./hosted-services.nix
+  ];
+}
diff --git a/hosts/servers/common/default.nix b/hosts/servers/common/default.nix
new file mode 100644
index 0000000..b659e64
--- /dev/null
+++ b/hosts/servers/common/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./boot.nix
+    ./nix.nix
+  ];
+}