diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d07e141..c5d5306 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
     "recommendations": [
         "bbenoist.nix",
-        "b4dm4n.nixpkgs-fmt"
+        "b4dm4n.nixpkgs-fmt",
+        "jnoortheen.nix-ide"
     ]
 }
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 74bed2c..2d835e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -89,6 +89,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1617690895,
+        "narHash": "sha256-5TUizPI+ibn/LBzevTIIyIZ1XeLl3HU0PTRk7H6AKTQ=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "7c00c8b5cab5dedb6519eabba7ca6d069e2dfdae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1617636226,
@@ -154,6 +170,7 @@
       "inputs": {
         "himalaya": "himalaya",
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_4"
       }
     },
diff --git a/flake.nix b/flake.nix
index f438483..9d7a330 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = github:NixOS/nixos-hardware/master;
     home-manager.url = "github:nix-community/home-manager";
     himalaya.url = "github:srid/himalaya/nixify-crate2nix";
   };
@@ -11,11 +12,12 @@
     let
       system = "x86_64-linux";
       # Make configuration for any computer I use in my home office.
-      mkHomeMachine = configurationNix: nixpkgs.lib.nixosSystem {
+      mkHomeMachine = configurationNix: thinkpadModule: nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
           # System configuration
           configurationNix
+          thinkpadModule
           ./features/passwordstore.nix
           ./features/syncthing.nix
           # ./features/virtualization.nix
@@ -38,7 +40,11 @@
       };
     in
     {
-      nixosConfigurations.p71 = mkHomeMachine ./hosts/p71.nix;
-      nixosConfigurations.x1c7 = mkHomeMachine ./hosts/x1c7.nix;
+      nixosConfigurations.p71 = mkHomeMachine
+        ./hosts/p71.nix
+        inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53;
+      nixosConfigurations.x1c7 = mkHomeMachine
+        ./hosts/x1c7.nix
+        inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen;
     };
 }