diff --git a/flake.lock b/flake.lock
index 5c36855..05c7659 100644
--- a/flake.lock
+++ b/flake.lock
@@ -249,20 +249,36 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723308742,
-        "narHash": "sha256-N66aj35PTGqlk4Aa0hrEIpVU/jPOGSTQGwyZU8Po80A=",
-        "owner": "8bitbuddhist",
+        "lastModified": 1723310128,
+        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "39e1c8e006faafb0336efe597d98451d01e105f3",
+        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
         "type": "github"
       },
       "original": {
-        "owner": "8bitbuddhist",
+        "owner": "NixOS",
         "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }
     },
+    "nixos-hardware-surface": {
+      "locked": {
+        "lastModified": 1722332872,
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1717794163,
@@ -362,6 +378,7 @@
         "nix-flatpak": "nix-flatpak",
         "nix-secrets": "nix-secrets",
         "nixos-hardware": "nixos-hardware",
+        "nixos-hardware-surface": "nixos-hardware-surface",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index dbb2235..5363336 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,9 @@
     lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1";
 
     # NixOS hardware quirks
-    nixos-hardware.url = "github:8bitbuddhist/nixos-hardware/master";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    # FIXME: Khanda fails to boot when using kernel 6.10+. This is a workaround.
+    nixos-hardware-surface.url = "github:NixOS/nixos-hardware?ref=14c333162ba53c02853add87a0000cbd7aa230c2";
 
     # Home-manager support
     home-manager = {
@@ -42,12 +44,12 @@
 
   outputs =
     inputs@{
-      self,
       home-manager,
       lanzaboote,
       lix-module,
       nix-flatpak,
       nixos-hardware,
+      nixos-hardware-surface,
       nixpkgs,
       nixpkgs-unstable,
       nix-secrets,
@@ -110,7 +112,7 @@
         Khanda = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = defaultModules ++ [
-            nixos-hardware.nixosModules.microsoft-surface-pro-9
+            nixos-hardware-surface.nixosModules.microsoft-surface-pro-9
             ./hosts/Khanda
           ];
         };