diff --git a/flake.nix b/flake.nix
index a4c634f..1b075da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,13 +31,29 @@
           ./wm/sway
         ];
       };
+      server = {
+        system = "x86_64-linux";
+        modules = [
+          ./server
+          inputs.home-manager.nixosModules.home-manager
+          ./home
+        ];
+      };
     in {
+      fred = inputs.nixpkgs.lib.nixosSystem {
+        modules = server.modules ++ [
+          {
+            networking.hostName = "fred";
+          }
+          ./hosts/fred
+        ];
+      };
       loki = inputs.nixpkgs.lib.nixosSystem {
         modules = workstation.modules ++ [
           {
             networking.hostName = "loki";
           }
-          ./hosts/loki/hardware-configuration.nix
+          ./hosts/loki
           inputs.nixos-hardware.nixosModules.dell-xps-13-9310
         ];
       };
@@ -46,7 +62,7 @@
           {
             networking.hostName = "smaug";
           }
-          ./hosts/smaug/hardware-configuration.nix
+          ./hosts/smaug
           ./hosts/smaug/podman.nix
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
         ];
@@ -56,7 +72,7 @@
           {
             networking.hostName = "pocket2";
           }
-          ./hosts/pocket2/hardware-configuration.nix
+          ./hosts/pocket2
           inputs.nixos-hardware.nixosModules.common-cpu-intel
           inputs.nixos-hardware.nixosModules.common-gpu-intel
           inputs.nixos-hardware.nixosModules.common-pc-laptop
@@ -68,7 +84,7 @@
           {
             networking.hostName = "dragon";
           }
-          ./hosts/dragon/hardware-configuration.nix
+          ./hosts/dragon
           inputs.nixos-hardware.nixosModules.common-cpu-intel
           inputs.nixos-hardware.nixosModules.common-gpu-intel
           inputs.nixos-hardware.nixosModules.common-pc-laptop
@@ -80,7 +96,7 @@
           {
             networking.hostName = "eve";
           }
-          ./hosts/eve/hardware-configuration.nix
+          ./hosts/eve
           inputs.nixos-hardware.nixosModules.google-pixelbook
         ];
       };
@@ -90,7 +106,7 @@
             services.getty.autologinUser = "don";
             networking.hostName = "vm2";
           }
-          ./hosts/vm1/hardware-configuration.nix
+          ./hosts/vm1
         ];
       };
     };