diff --git a/infra/common/default.nix b/infra/common/default.nix
index f3fb04b..0630f2f 100644
--- a/infra/common/default.nix
+++ b/infra/common/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./hardware.nix
     ./networking.nix
     ./users.nix
   ];
diff --git a/infra/common/hardware.nix b/infra/common/hardware.nix
new file mode 100644
index 0000000..3410294
--- /dev/null
+++ b/infra/common/hardware.nix
@@ -0,0 +1,24 @@
+{ modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    initrd = {
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "virtio_pci"
+        "virtio_scsi"
+        "sd_mod"
+        "sr_mod"
+      ];
+      kernelModules = [ "dm-snapshot" ];
+    };
+  };
+}
diff --git a/infra/vm02116/configuration.nix b/infra/vm02116/configuration.nix
index 1f1e58c..01f855f 100644
--- a/infra/vm02116/configuration.nix
+++ b/infra/vm02116/configuration.nix
@@ -9,10 +9,6 @@
     ip6 = "2a00:51c0:12:1201::20";
   };
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
@@ -40,6 +36,10 @@
     subversion
   ];
 
+  ## vm02116 is running on old hardware based on a Xen VM environment, so it
+  ## needs these extra options. Once the VM gets moved to a newer node, these
+  ## two options can safely be removed.
+  boot.initrd.availableKernelModules = [ "xen_blkfront" ];
   services.xe-guest-utilities.enable = true;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
diff --git a/infra/vm02116/hardware-configuration.nix b/infra/vm02116/hardware-configuration.nix
index 82d1356..2110792 100644
--- a/infra/vm02116/hardware-configuration.nix
+++ b/infra/vm02116/hardware-configuration.nix
@@ -1,21 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { lib, ... }:
 
 {
-  imports = [ ];
-
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "sr_mod"
-    "xen_blkfront"
-  ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
     fsType = "ext4";
@@ -26,14 +11,7 @@
     fsType = "vfat";
   };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enX0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/infra/vm02179/configuration.nix b/infra/vm02179/configuration.nix
index e38180b..59a5add 100644
--- a/infra/vm02179/configuration.nix
+++ b/infra/vm02179/configuration.nix
@@ -9,10 +9,6 @@
     ip6 = "2a00:51c0:12:1201::179";
   };
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
diff --git a/infra/vm02179/hardware-configuration.nix b/infra/vm02179/hardware-configuration.nix
index 87f1d3d..36a2506 100644
--- a/infra/vm02179/hardware-configuration.nix
+++ b/infra/vm02179/hardware-configuration.nix
@@ -1,23 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ lib, ... }:
 
 {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241";
     fsType = "ext4";
@@ -32,14 +15,7 @@
     ];
   };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/infra/vm02186/hardware-configuration.nix b/infra/vm02186/hardware-configuration.nix
index dcbe942..d2d567f 100644
--- a/infra/vm02186/hardware-configuration.nix
+++ b/infra/vm02186/hardware-configuration.nix
@@ -1,23 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ lib, ... }:
 
 {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a";
     fsType = "ext4";
@@ -32,14 +15,7 @@
     ];
   };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/infra/vm02186/procolix-configuration.nix b/infra/vm02186/procolix-configuration.nix
index 691df9d..ea0c923 100644
--- a/infra/vm02186/procolix-configuration.nix
+++ b/infra/vm02186/procolix-configuration.nix
@@ -9,10 +9,6 @@
     ip6 = "2a00:51c0:12:1201::186";
   };
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
diff --git a/infra/vm02187/configuration.nix b/infra/vm02187/configuration.nix
index 4304bd2..3c58f39 100644
--- a/infra/vm02187/configuration.nix
+++ b/infra/vm02187/configuration.nix
@@ -9,10 +9,6 @@
     ip6 = "2a00:51c0:12:1201::187";
   };
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   services.phpfpm.pools.mediawiki.phpOptions = ''
     upload_max_filesize = 1024M;
     post_max_size = 1024M;
diff --git a/infra/vm02187/hardware-configuration.nix b/infra/vm02187/hardware-configuration.nix
index 79f182e..24a8a49 100644
--- a/infra/vm02187/hardware-configuration.nix
+++ b/infra/vm02187/hardware-configuration.nix
@@ -1,23 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ lib, ... }:
 
 {
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "ata_piix"
-    "uhci_hcd"
-    "virtio_pci"
-    "virtio_scsi"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
     fsType = "ext4";
@@ -32,14 +15,7 @@
     ];
   };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }