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..ae1b76a
--- /dev/null
+++ b/infra/common/hardware.nix
@@ -0,0 +1,18 @@
+{
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    initrd = {
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "sr_mod"
+        "xen_blkfront"
+      ];
+      kernelModules = [ "dm-snapshot" ];
+    };
+  };
+}
diff --git a/infra/vm02116/configuration.nix b/infra/vm02116/configuration.nix
index 1f1e58c..c0d4066 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";
 
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";
 }