diff --git a/flake.lock b/flake.lock
index 312959a..33b3a72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712390667,
-        "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
+        "lastModified": 1712759992,
+        "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b787726a8413e11b074cde42704b4af32d95545c",
+        "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1712324865,
-        "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
+        "lastModified": 1712760404,
+        "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
+        "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
         "type": "github"
       },
       "original": {
@@ -188,22 +188,6 @@
         "type": "github"
       }
     },
-    "nixos-hardware-16arha7": {
-      "locked": {
-        "lastModified": 1712449958,
-        "narHash": "sha256-QDJaTsWRA42nidOWhS3hN3v9IiQW8SvEY2yPF9qbqzA=",
-        "owner": "8bitbuddhist",
-        "repo": "nixos-hardware",
-        "rev": "defa95f33bf4749ce8e3f60621ad3aeefa656229",
-        "type": "github"
-      },
-      "original": {
-        "owner": "8bitbuddhist",
-        "ref": "lenovo-legion-16ARHA7",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1682741954,
@@ -238,11 +222,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
@@ -289,7 +273,6 @@
         "lanzaboote": "lanzaboote",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
-        "nixos-hardware-16arha7": "nixos-hardware-16arha7",
         "nixpkgs": "nixpkgs_2"
       }
     },
diff --git a/flake.nix b/flake.nix
index e8e51dd..081e201 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,6 @@
 
 		# Hardware configurations
 		nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-		nixos-hardware-16arha7.url = "github:8bitbuddhist/nixos-hardware/lenovo-legion-16ARHA7";
 
 		# Home-manager
 		home-manager = {
@@ -26,7 +25,7 @@
 		# TODO: Add Disko - https://github.com/nix-community/disko
 	};
 
-	outputs = inputs@{ self, nixpkgs, lanzaboote, nix-flatpak, home-manager, nixos-hardware, nixos-hardware-16arha7, ... }:
+	outputs = inputs@{ self, nixpkgs, lanzaboote, nix-flatpak, home-manager, nixos-hardware, ... }:
 		let 
 			inherit (self) outputs;
 			inherit (nixpkgs) lib;
@@ -70,7 +69,7 @@
 				Haven = nixpkgs.lib.nixosSystem {
 					system = "x86_64-linux";
 					modules = defaultModules.base ++ [
-      			nixos-hardware.nixosModules.common-cpu-amd-pstate
+						nixos-hardware.nixosModules.common-cpu-amd-pstate
 						./hosts/Haven
 					];
 				};
@@ -86,10 +85,11 @@
 				Shura = nixpkgs.lib.nixosSystem {
 					system = "x86_64-linux";
 					modules = defaultModules.base ++ [
-						nixos-hardware-16arha7.nixosModules.lenovo-legion-16arha7
+						nixos-hardware.nixosModules.lenovo-legion-16arha7
 						./hosts/Shura
 					];
 				};
 			};
 		};
 	}
+