diff --git a/flake.nix b/flake.nix
index d8e7097..529ced8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,16 +5,28 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
     home-manager = {
       url = "github:nix-community/home-manager/release-21.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, flake-utils, home-manager }: {
-    nixosConfigurations.gwyn = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [ ./hardware/precision/configuration.nix ];
+  outputs =
+    inputs @ { self
+    , nixpkgs
+    , nixpkgs-unstable
+    , nixos-hardware
+    , flake-utils
+    , home-manager
+    }: {
+      nixosConfigurations.gwyn = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hardware/precision/configuration.nix
+          nixos-hardware.nixosModules.dell-precision-5530
+          nixos-hardware.nixosModules.common-gpu-nvidia
+        ];
+      };
     };
-  };
 }
diff --git a/hardware/precision/hardware-configuration.nix b/hardware/precision/hardware-configuration.nix
index 9693035..cd3ed80 100644
--- a/hardware/precision/hardware-configuration.nix
+++ b/hardware/precision/hardware-configuration.nix
@@ -5,7 +5,6 @@
 
 {
   imports = [
-    ../nixos-hardware/dell/precision/5530/default.nix
     ./nvidia.nix
   ];
 
diff --git a/hardware/precision/nvidia.nix b/hardware/precision/nvidia.nix
index 3a2196b..a23447c 100644
--- a/hardware/precision/nvidia.nix
+++ b/hardware/precision/nvidia.nix
@@ -1,8 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [
-    ../nixos-hardware/common/gpu/nvidia.nix
-  ];
   environment = {
     variables = {
       XDG_DATA_HOME = "$HOME/.local/share";