diff --git a/flake.lock b/flake.lock
index 13eb636..68e69f0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -347,6 +347,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1771969195,
+        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1768127708,
@@ -483,6 +499,7 @@
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index d9ae9e9..4d0e3dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,8 @@
     #   flake = false;
     # };
 
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
diff --git a/hosts/matej-nixos/configuration.nix b/hosts/matej-nixos/configuration.nix
index 5fe2c82..d76f89a 100644
--- a/hosts/matej-nixos/configuration.nix
+++ b/hosts/matej-nixos/configuration.nix
@@ -13,6 +13,7 @@ in
 
 {
   imports = [
+    inputs.nixos-hardware.nixosModules.framework-16-amd-ai-300-series
     inputs.stylix.nixosModules.stylix
     inputs.self.nixosModules.yubikey
     inputs.self.nixosModules.sway
@@ -23,8 +24,6 @@ in
     inputs.self.nixosModules.gnupg
     inputs.self.nixosModules.tuigreet
     inputs.self.nixosModules.workstation
-    inputs.self.nixosModules.nvidia
-    inputs.self.nixosModules.initrd-ssh
     inputs.self.nixosModules.localisation
   ];
 
@@ -40,23 +39,7 @@ in
     command = "sway";
   };
 
-  sway = {
-    enable = true;
-    cmdFlags = [ "--unsupported-gpu" ];
-  };
-
-  nvidia.enable = true;
-
-  initrd-ssh = {
-    enable = true;
-    networkModule = "r8169";
-    ip = {
-      enable = true;
-      address = "10.222.0.247";
-      gateway = "10.222.0.1";
-      interface = "enp5s0";
-    };
-  };
+  sway.enable = true;
 
   stylix = {
     enable = true;
@@ -94,22 +77,18 @@ in
     localNetworkGameTransfers.openFirewall = true;
   };
 
+  services.hardware.bolt.enable = true;
   hardware.keyboard.zsa.enable = true;
   hardware.ledger.enable = true;
   hardware.bluetooth.powerOnBoot = true;
+  hardware.inputmodule.enable = true;
+
+  programs.nm-applet.enable = true;
 
   networking = {
     hostName = "matej-nixos";
-    useDHCP = false;
     networkmanager.enable = true;
-    interfaces.enp5s0.ipv4.addresses = [
-      {
-        address = "10.222.0.247";
-        prefixLength = 24;
-      }
-    ];
     firewall.enable = false;
-    defaultGateway = "10.222.0.1";
     nameservers = [
       "1.1.1.1"
       "8.8.8.8"
diff --git a/hosts/matej-nixos/hardware-configuration.nix b/hosts/matej-nixos/hardware-configuration.nix
index e7b72f8..a27e69c 100644
--- a/hosts/matej-nixos/hardware-configuration.nix
+++ b/hosts/matej-nixos/hardware-configuration.nix
@@ -17,8 +17,10 @@
   boot.initrd.availableKernelModules = [
     "nvme"
     "xhci_pci"
-    "ahci"
+    "thunderbolt"
     "usbhid"
+    "uas"
+    "sd_mod"
   ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
@@ -33,7 +35,7 @@
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/7151-CE52";
+    device = "/dev/disk/by-uuid/42D9-FAFD";
     fsType = "vfat";
     options = [
       "fmask=0022"