diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix
index 32fa495e..90dd0b2a 100644
--- a/nixos/boxes/foureighty.nix
+++ b/nixos/boxes/foureighty.nix
@@ -5,32 +5,6 @@
   boot = {
     kernelPackages = pkgs.linuxPackages_latest_hardened;
     extraModulePackages = with config.boot.kernelPackages; [ wireguard ];
-    kernelPatches = [{
-      name = "bpf_plus_newer_intel";
-      patch = null;
-      extraConfig = ''
-        MCORE2 y
-        ENERGY_MODEL y
-        X86_INTEL_MPX y
-        INTEL_TXT y
-
-        PREEMPT_VOLUNTARY y
-
-        BPF y
-        BPF_EVENTS y
-        BPF_JIT y
-        BPF_SYSCALL y
-        DUMMY m
-        HAVE_EBPF_JIT y
-        KALLSYMS_ALL y
-        NET_ACT_BPF m
-        NET_ACT_GACT m
-        NET_ACT_POLICE m
-        NET_CLS_BPF m
-        NET_SCH_SFQ m
-        VXLAN m
-      '';}
-    ];
 
     initrd.kernelModules = [ "i915" ];
     initrd.availableKernelModules = [
diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index ba6db755..36f07e4e 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -1,12 +1,15 @@
 { config, pkgs, ... }:
 {
   services = {
-    fwupd.enable = true;
+    fwupd = {
+      enable = true;
+      package = pkgs.unstable.fwupd;
+    };
 
     tlp = {
       enable = true;
       extraConfig = ''
-        DISK_IOSCHED="mq-deadline"
+          DISK_IOSCHED="mq-deadline"
       '';
     };
 
@@ -47,8 +50,8 @@
       useGlamor = true;
 
       deviceSection = ''
-        Option "TearFree" "true"
-        Option "AccelMethod" "sna"
+          Option "TearFree" "true"
+          Option "AccelMethod" "sna"
       '';
 
       displayManager.sddm = {