diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ed7226331d7..9287852bacf 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -37,12 +37,10 @@ in
     boot.kernelPackages = mkOption {
       default = pkgs.linuxPackages;
       type = types.unspecified // { merge = mergeEqualOption; };
-      apply = kernelPackages: kernelPackages.extend (self: super: {
-        kernel = super.kernel.override {
-          inherit randstructSeed;
-          kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
-          features = lib.recursiveUpdate super.kernel.features features;
-        };
+      apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override {
+        inherit randstructSeed;
+        kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches;
+        features = lib.recursiveUpdate kernelPackages.kernel.features features;
       });
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.