diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 1a1ca6b..b266919 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -6,7 +6,7 @@
 }:
 
 # To test the kernel build:
-# nix-build -E "with import <nixpkgs> {}; (pkgs.callPackage ./. {}).kernel"
+# nix-build -E "with import <nixpkgs> {}; (pkgs.callPackage ./. {}).boot.kernelPackages.kernel"
 
 let
   inherit (lib) kernel recurseIntoAttrs;
diff --git a/microsoft/surface/kernel/linux-5.16.11.nix b/microsoft/surface/kernel/linux-5.16.11.nix
index ae8dbd4..6083531 100644
--- a/microsoft/surface/kernel/linux-5.16.11.nix
+++ b/microsoft/surface/kernel/linux-5.16.11.nix
@@ -1,91 +1,91 @@
-{ lib, callPackage, linuxPackagesFor, ... }:
-# To test the kernel build:
-# nix-build -E "with import <nixpkgs> {}; (pkgs.callPackage ./linux-5.16.11.nix {}).kernel"
+{ lib,
+  repos,
+}:
+
 let
-  repos = callPackage ../repos.nix {};
-  linuxPkg = { fetchurl, buildLinux, ... }@args:
-    buildLinux (args // rec {
-      version = "5.16.11";
-      modDirVersion = version;
-      extraMeta.branch = "5.16";
+  inherit (lib) kernel;
+  version = "5.16.11";
 
-      src = repos.linux-surface-kernel {
-        # Kernel 5.16.11
-        rev = "db94c89f56d6ceae03ca3802e11197f48e6c539f";
-        sha256 = "0c58ri0i9gdb4w7l361pnkvq6ap17kmgnxngh0bcdmgn4dc88wx2";
-      };
+in {
+  inherit version;
+  modDirVersion = version;
+  branch = "5.16";
+  src = repos.linux-surface-kernel {
+    # Kernel 5.16.11 from the linux-surface/kernel repo:
+    rev = "db94c89f56d6ceae03ca3802e11197f48e6c539f";
+    sha256 = "0c58ri0i9gdb4w7l361pnkvq6ap17kmgnxngh0bcdmgn4dc88wx2";
+  };
+  kernelPatches = [{
+    name = "microsoft-surface-patches-linux-${version}";
+    patch = null;
+    structuredExtraConfig = with kernel; {
+      #
+      # Surface Aggregator Module
+      #
+      SURFACE_AGGREGATOR = module;
+      SURFACE_AGGREGATOR_ERROR_INJECTION = no;
+      SURFACE_AGGREGATOR_BUS = yes;
+      SURFACE_AGGREGATOR_CDEV = module;
+      SURFACE_AGGREGATOR_REGISTRY = module;
 
-      kernelPatches = [{
-        name = "microsoft-surface-patches-linux-5.16.2";
-        patch = null;
-        structuredExtraConfig = with lib.kernel; {
-          #
-          # Surface Aggregator Module
-          #
-          SURFACE_AGGREGATOR = module;
-          SURFACE_AGGREGATOR_ERROR_INJECTION = no;
-          SURFACE_AGGREGATOR_BUS = yes;
-          SURFACE_AGGREGATOR_CDEV = module;
-          SURFACE_AGGREGATOR_REGISTRY = module;
+      SURFACE_ACPI_NOTIFY = module;
+      SURFACE_DTX = module;
+      SURFACE_PLATFORM_PROFILE = module;
 
-          SURFACE_ACPI_NOTIFY = module;
-          SURFACE_DTX = module;
-          SURFACE_PLATFORM_PROFILE = module;
+      SURFACE_HID = module;
+      SURFACE_KBD = module;
 
-          SURFACE_HID = module;
-          SURFACE_KBD = module;
+      BATTERY_SURFACE = module;
+      CHARGER_SURFACE = module;
 
-          BATTERY_SURFACE = module;
-          CHARGER_SURFACE = module;
+      #
+      # Surface laptop 1 keyboard
+      #
+      SERIAL_DEV_BUS = yes;
+      SERIAL_DEV_CTRL_TTYPORT = yes;
 
-          #
-          # Surface laptop 1 keyboard
-          #
-          SERIAL_DEV_BUS = yes;
-          SERIAL_DEV_CTRL_TTYPORT = yes;
+      #
+      # Surface Hotplug
+      #
+      SURFACE_HOTPLUG = module;
 
-          #
-          # Surface Hotplug
-          #
-          SURFACE_HOTPLUG = module;
+      #
+      # IPTS touchscreen
+      #
+      # This only enables the user interface for IPTS data.
+      # For the touchscreen to work, you need to install iptsd.
+      #
+      MISC_IPTS = module;
 
-          #
-          # IPTS touchscreen
-          #
-          # This only enables the user interface for IPTS data.
-          # For the touchscreen to work, you need to install iptsd.
-          #
-          MISC_IPTS = module;
+      #
+      # Cameras: IPU3
+      #
+      VIDEO_IPU3_IMGU = module;
+      VIDEO_IPU3_CIO2 = module;
+      CIO2_BRIDGE = yes;
+      INTEL_SKL_INT3472 = module;
 
-          #
-          # Cameras: IPU3
-          #
-          VIDEO_IPU3_IMGU = module;
-          VIDEO_IPU3_CIO2 = module;
-          CIO2_BRIDGE = yes;
-          INTEL_SKL_INT3472 = module;
+      #
+      # Cameras: Sensor drivers
+      #
+      VIDEO_OV5693 = module;
+      VIDEO_OV8865 = module;
 
-          #
-          # Cameras: Sensor drivers
-          #
-          VIDEO_OV5693 = module;
-          VIDEO_OV8865 = module;
+      #
+      # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
+      #
+      APDS9960 = module;
 
-          #
-          # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-          #
-          APDS9960 = module;
+      #
+      # Other Drivers
+      #
+      INPUT_SOC_BUTTON_ARRAY = module;
+      SURFACE_3_BUTTON = module;
+      SURFACE_3_POWER_OPREGION = module;
+      SURFACE_PRO3_BUTTON = module;
+      SURFACE_GPE = module;
+      SURFACE_BOOK1_DGPU_SWITCH = module;
+    };
+  }];
+}
 
-          #
-          # Other Drivers
-          #
-          INPUT_SOC_BUTTON_ARRAY = module;
-          SURFACE_3_BUTTON = module;
-          SURFACE_3_POWER_OPREGION = module;
-          SURFACE_PRO3_BUTTON = module;
-          SURFACE_GPE = module;
-          SURFACE_BOOK1_DGPU_SWITCH = module;
-        };
-      }];
-    } // (args.argsOverride or {}));
-in lib.recurseIntoAttrs (linuxPackagesFor (callPackage linuxPkg {}))