diff --git a/nix/nixos-module/default.nix b/nix/nixos-module/default.nix
index 939f800..4a037a8 100644
--- a/nix/nixos-module/default.nix
+++ b/nix/nixos-module/default.nix
@@ -17,15 +17,7 @@ in {
     ./collectd
   ] ++
   optionals (hostConfig.role == "server") [
-    ./server/lxc-containers.nix
-    ./server/network.nix
-    ./server/qemu.nix
-  ] ++
-  optionals (hostName == "server1") [
-    ./server/server1.nix
-  ] ++
-  optionals (hostName == "server2") [
-    ./server/server2.nix
+    ./server/default.nix
   ] ++
   optionals (hostConfig.role == "container") [
     ./container/defaults.nix
diff --git a/nix/nixos-module/server/default.nix b/nix/nixos-module/server/default.nix
new file mode 100644
index 000000000..6356645
--- /dev/null
+++ b/nix/nixos-module/server/default.nix
@@ -0,0 +1,11 @@
+{ hostName, ... }:
+{
+  imports = [
+    ./defaults.nix
+    ./network.nix
+    ./lxc-containers.nix
+    ./qemu.nix
+    # host-specific configuration
+    (./. + "/${hostName}.nix")
+  ];
+}
diff --git a/nix/nixos-module/server/defaults.nix b/nix/nixos-module/server/defaults.nix
new file mode 100644
index 000000000..f8a52ca
--- /dev/null
+++ b/nix/nixos-module/server/defaults.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  boot.kernelModules = [ "kvm-intel" "pppoe" ];
+  boot.kernelParams = [ "nomodeset" ];
+
+  hardware.cpu.intel.updateMicrocode = true;
+
+  time.timeZone = "Europe/Berlin";
+
+  environment.systemPackages = with pkgs; [
+    wget vim git screen
+  ];
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "prohibit-password";
+}
diff --git a/nix/nixos-module/server/server1.nix b/nix/nixos-module/server/server1.nix
index b7d9e14..6e6a87b 100644
--- a/nix/nixos-module/server/server1.nix
+++ b/nix/nixos-module/server/server1.nix
@@ -13,7 +13,6 @@
 
   boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "hpsa" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
   boot.supportedFilesystems = [ "zfs" ];
   boot.initrd.supportedFilesystems = [ "zfs" ];
@@ -51,13 +50,4 @@
     };
 
   swapDevices = [ ];
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  environment.systemPackages = with pkgs; [
-    wget vim git screen
-  ];
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "prohibit-password";
 }
diff --git a/nix/nixos-module/server/server2.nix b/nix/nixos-module/server/server2.nix
index 0d57129..1f3e11f 100644
--- a/nix/nixos-module/server/server2.nix
+++ b/nix/nixos-module/server/server2.nix
@@ -3,10 +3,7 @@
 {
   boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "pppoe" ];
   boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "nomodeset" ];
-  hardware.cpu.intel.updateMicrocode = true;
   fileSystems."/" =
     { device = "server2/root";
       fsType = "zfs";
@@ -43,13 +40,4 @@
 
   networking.hostName = "server2"; # Define your hostname.
   networking.hostId = "52525252";
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  environment.systemPackages = with pkgs; [
-    wget vim git screen
-  ];
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "prohibit-password";
 }