diff --git a/machines/pikvm.nix b/machines/pikvm.nix
deleted file mode 100644
index d384897..0000000
--- a/machines/pikvm.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  machines.pikvm = {
-    arch = "aarch64-linux";
-    isRaspberryPi = true;
-
-    nixosModule = {
-      config,
-      inputs,
-      lib,
-      ...
-    }: {
-      # imports = [ "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ];
-      lab = {
-        storage.profile = "pi";
-      };
-
-      environment.systemPackages = with inputs.nixpkgs.legacyPackages.aarch64-linux; [
-        (mplayer.override {
-          v4lSupport = true;
-        })
-        ffmpeg
-        v4l-utils
-      ];
-
-      boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
-    };
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
index 2448041..a595904 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -26,8 +26,6 @@
 
   config = {
     time.timeZone = "Europe/Amsterdam";
-    hardware.cpu.intel.updateMicrocode = lib.mkIf (! machine.isRaspberryPi) config.hardware.enableRedistributableFirmware;
-
     nixpkgs = {
       config.allowUnfree = true;
       overlays = [
@@ -110,24 +108,6 @@
     ];
 
     boot = lib.mkIf (! machine.isRaspberryPi) {
-      kernelModules = ["kvm-intel"];
-      extraModulePackages = [];
-      kernel.sysctl."fs.inotify.max_user_instances" = 256;
-
-      initrd = {
-        kernelModules = [];
-
-        availableKernelModules = [
-          "ahci"
-          "xhci_pci"
-          "nvme"
-          "usbhid"
-          "usb_storage"
-          "sd_mod"
-          "sdhci_pci"
-        ];
-      };
-
       loader = {
         systemd-boot.enable = lib.mkDefault true;
         efi.canTouchEfiVariables = true;
diff --git a/nixos.nix b/nixos.nix
index 4d2d0ad..34f3fb8 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -14,8 +14,6 @@
     machines;
 in {
   nixosConfigurations = mkNixosSystems (name: machine: {
-    system = machine.arch;
-
     specialArgs = {inherit self inputs machine machines;};
 
     modules = [