diff --git a/hosts/gaia/fan-control.nix b/hosts/gaia/fan-control.nix
index 2804696..1b1ad47 100644
--- a/hosts/gaia/fan-control.nix
+++ b/hosts/gaia/fan-control.nix
@@ -1,10 +1,9 @@
 { pkgs, ... }:
 {
-  hardware.raspberry-pi."4" = {
-    poe-plus-hat.enable = true;
-  };
+  hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;
 
   hardware.deviceTree = {
+    filter = "bcm2711-rpi-4*.dtb";
     overlays = pkgs.lib.mkForce [
       {
         name = "rpi-poe-plus-overlay";
diff --git a/hosts/gaia/gaia1.nix b/hosts/gaia/gaia1.nix
index dbc2306..2ec4e7d 100644
--- a/hosts/gaia/gaia1.nix
+++ b/hosts/gaia/gaia1.nix
@@ -20,9 +20,7 @@ in
   };
 
   hardware.raspberry-pi."4" = {
-    dwc2.enable = true;
     fkms-3d.enable = true;
-    audio.enable = true;
   };
 
   networking.hostName = "gaia1";
diff --git a/hosts/spdr/default.nix b/hosts/spdr/default.nix
index 03986b3..d54f35b 100644
--- a/hosts/spdr/default.nix
+++ b/hosts/spdr/default.nix
@@ -28,6 +28,30 @@ in
   };
   boot.loader.timeout = 10;
 
+  # kernel
+  boot.kernelPackages =
+    let
+      linuxT2 = "${inputs.nixos-hardware}/apple/t2/pkgs/linux-t2";
+      patchset = builtins.fromJSON (builtins.readFile "${linuxT2}/stable.json");
+      dropped = [
+        "4001-asahi-trackpad.patch"
+        "4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch"
+        "4005-HID-magicmouse-fix-regression-breaking-support-for-M.patch"
+      ];
+    in
+    lib.mkForce (
+      pkgs.linuxPackagesFor (
+        pkgs.callPackage "${linuxT2}/generic.nix" { } {
+          kernel = pkgs.linux_6_18;
+          patchesFile = builtins.toFile "stable.json" (
+            builtins.toJSON (
+              patchset // { patches = lib.filter (p: !(builtins.elem p.name dropped)) patchset.patches; }
+            )
+          );
+        }
+      )
+    );
+
   # zfs
   boot.supportedFilesystems = [ "zfs" ];
   boot.kernelParams = [ "zfs.zfs_arc_max=2147483648" ];
diff --git a/overlay/default.nix b/overlay/default.nix
index f49c50b..7ceb234 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -17,11 +17,6 @@ final: prev: {
     });
   };
 
-  # needed until https://github.com/NixOS/nixpkgs/pull/554776 lands
-  karakeep = prev.karakeep.override {
-    nodejs = prev.nodejs_22;
-  };
-
   python314Packages = prev.python314Packages.overrideScope (
     final: prev: {
       python-ldap = prev.python-ldap.overridePythonAttrs { doCheck = false; };