diff --git a/flake.nix b/flake.nix
index 6728267..27b1f21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,20 +37,7 @@
             modules =
               commonModules
               ++ lib.optionals (type == "graphical") graphicalModules
-              # Options for specific hostnames.
-              ++ (lib.optionals (hostname == "nemesis") [
-                ./configs/bootloaders/systemd-boot.nix
-                ./configs/filesystems/hw-nemesis.nix
-                ./configs/hardware/cpu_amd.nix
-                ./configs/hardware/nvidia.nix
-                inputs.nixos-hardware.nixosModules.gigabyte-b650
-              ])
-              ++ (lib.optionals (hostname == "apollo") [
-                ./configs/bootloaders/systemd-boot.nix
-                ./configs/filesystems/impermanence.nix
-                ./configs/hardware/cpu_intel.nix
-                ./configs/services.nix
-              ]);
+              ++ [ ./hosts/${hostname}.nix ];
           };
       };
     in
@@ -59,7 +46,7 @@
         (mkSystem "graphical" "nemesis"
           "nvme-nvme.c0a9-323332354536453737343334-435432303030503353534438-00000001"
         )
-        (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab")
+        # (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab")
         (mkSystem "headless" "apollo" "/dev/disk/by-id/nvme-eui.002538d221b47b01")
       ];
     };
diff --git a/hosts/apollo.nix b/hosts/apollo.nix
new file mode 100644
index 0000000..43e0592
--- /dev/null
+++ b/hosts/apollo.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../configs/bootloaders/systemd-boot.nix
+    ../configs/filesystems/impermanence.nix
+    ../configs/hardware/cpu_intel.nix
+    ../configs/services.nix
+  ];
+}
diff --git a/hosts/nemesis.nix b/hosts/nemesis.nix
new file mode 100644
index 0000000..6948e49
--- /dev/null
+++ b/hosts/nemesis.nix
@@ -0,0 +1,17 @@
+{
+  inputs,
+  lib,
+  config,
+  ...
+}:
+{
+  imports = [
+    ../configs/bootloaders/systemd-boot.nix
+    ../configs/filesystems/hw-nemesis.nix
+    ../configs/hardware/nvidia.nix
+    inputs.nixos-hardware.nixosModules.gigabyte-b650
+  ];
+  boot.kernelModules = [ "kvm-amd" ];
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}