diff --git a/flake.lock b/flake.lock
index 6834fc4..900a508 100644
--- a/flake.lock
+++ b/flake.lock
@@ -276,6 +276,7 @@
         "type": "github"
       }
     },
+<<<<<<< Updated upstream
     "nixos-hardware-fw16": {
       "locked": {
         "lastModified": 1713209644,
@@ -292,6 +293,8 @@
         "url": "https://github.com/jkoking/nixos-hardware"
       }
     },
+=======
+>>>>>>> Stashed changes
     "nixos-modules": {
       "inputs": {
         "flake-utils": [
@@ -408,7 +411,6 @@
         "nix-index-database": "nix-index-database",
         "nix-pre-commit": "nix-pre-commit",
         "nixos-hardware": "nixos-hardware",
-        "nixos-hardware-fw16": "nixos-hardware-fw16",
         "nixos-modules": "nixos-modules",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable_2",
diff --git a/flake.nix b/flake.nix
index cd39709..7e85d89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,10 +96,6 @@
       url = "github:NixOS/nixos-hardware";
     };
 
-    nixos-hardware-fw16 = {
-      url = "git+https://github.com/jkoking/nixos-hardware?ref=add-framework-16";
-    };
-
     attic = {
       url = "github:zhaofengli/attic";
       inputs = {
diff --git a/users/alice/systems/artemision/default.nix b/users/alice/systems/artemision/default.nix
index 5aaee62..b050b41 100644
--- a/users/alice/systems/artemision/default.nix
+++ b/users/alice/systems/artemision/default.nix
@@ -4,7 +4,7 @@
   home = true;
   sops = true;
   modules = [
-    inputs.nixos-hardware-fw16.nixosModules.framework-16-7040-amd
+    inputs.nixos-hardware.nixosModules.framework-16-7040-amd
     #({ pkgs, ... }: {
     #  nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
     #  environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {