diff --git a/applications/emacs.nix b/applications/emacs.nix
index fce8129..b649230 100644
--- a/applications/emacs.nix
+++ b/applications/emacs.nix
@@ -1,7 +1,14 @@
 { config, pkgs, unstable, doomEmacs, ... }:
+let
+  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [
+    vterm
+    pdf-tools
+  ]);
+in
 {
   # Install emacs
   environment.systemPackages = [
+    emacsPackage
     # For markdown rendering
     pkgs.pythonPackages.grip
     # For graph generation
@@ -11,17 +18,20 @@
   # Utilize home-manager
   home-manager.users.nathan = {
     # Nixify doomEmacs
+    # TODO:Reenable, currently off because of ghub
     imports = [ doomEmacs ];
     programs.doom-emacs = {
-      enable = true;
+      enable = false;
       doomPrivateDir = ../doom.d;
-      emacsPackage = unstable.emacsPgtkNativeComp;
+      emacsPackage = emacsPackage;
     };
     # Startup service
     services.emacs = {
       enable = pkgs.stdenv.isLinux;
       client.enable = true;
       defaultEditor = true;
+      # TODO remove when we enable doom-emacs again
+      package = emacsPackage;
     };
   };
 }
diff --git a/flake.lock b/flake.lock
index eb5ba83..2ab879a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,15 +58,15 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1653240254,
-        "narHash": "sha256-w/Q7WxJP+jiGMcej03elFARRKCRDOMFWtVcqeVrTfuc=",
+        "lastModified": 1653452277,
+        "narHash": "sha256-brrORMUToSSoFGfSeVAJ7cRq+e03lWBztSPRqgbkRtg=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "996f7b25fa056a219f426b4c7d1bdc81c7eec257",
+        "rev": "2a9b6c9109e73e7c2c3b5de32577a1365926524c",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1653200835,
-        "narHash": "sha256-t/iorpsapAH97RAMyv3+5wF+qmwC96WKwKDCWtnt70k=",
+        "lastModified": 1653460119,
+        "narHash": "sha256-tP4mnBaE/2yehchIeRrCueF2NLS1G2XKGKq+q/oG0+o=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "4853925d5169226c72d9f93b9feacff0250b1959",
+        "rev": "9a49d754de250ad696e49c9ae4ce4561ffe3fc38",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653153149,
-        "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=",
+        "lastModified": 1653340164,
+        "narHash": "sha256-t6BPApyasx6FOv2cEVyFBXvkEDrknyUe7bngMbNSBkA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8",
+        "rev": "e66f0ff69a6c0698b35034b842c4b68814440778",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653153149,
-        "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=",
+        "lastModified": 1653340164,
+        "narHash": "sha256-t6BPApyasx6FOv2cEVyFBXvkEDrknyUe7bngMbNSBkA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8",
+        "rev": "e66f0ff69a6c0698b35034b842c4b68814440778",
         "type": "github"
       },
       "original": {
@@ -406,11 +406,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1652885393,
-        "narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=",
+        "lastModified": 1653060744,
+        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "48037fd90426e44e4bf03e6479e88a11453b9b66",
+        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
         "type": "github"
       },
       "original": {
@@ -436,6 +436,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-22_05": {
+      "locked": {
+        "lastModified": 1653460991,
+        "narHash": "sha256-8MgFe84UUKw5k5MybirNH0S+oSluN2cRQGt+ZkW+dxQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0c3bf3a5c3ab6be29138b88900c417660a284fbd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1653060744,
@@ -574,11 +590,11 @@
         "quazip": "quazip"
       },
       "locked": {
-        "lastModified": 1653260953,
-        "narHash": "sha256-RK77TbKMDoNDWJSROmxG5cC+sv/gsVy7prfOSMFMdEg=",
+        "lastModified": 1653418399,
+        "narHash": "sha256-YCbJAi/AWqk++qg8ADvXke0ghO1A1iigCx9Fq1rN5m0=",
         "owner": "PolyMC",
         "repo": "PolyMC",
-        "rev": "ac4497a1f232de78b3efc5e2ff0d5ca9ed224ad1",
+        "rev": "e8b7e70ec95a7398b89c805ef3302ea08b6ca142",
         "type": "github"
       },
       "original": {
@@ -653,11 +669,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1653147556,
-        "narHash": "sha256-MPZ34kE+GshaghPmY5zBTTameRX33IoUHrrYa+H8UbI=",
+        "lastModified": 1653426632,
+        "narHash": "sha256-hDUT+zbzU7SOJJr3VoKiDLJLubu7x6ggDfJ2rzYnYxY=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "3de03d4c61d2405b66337b96ea97aa21f7d04e4b",
+        "rev": "d7c147406eff20783abba6ff1fe250ecc44cf800",
         "type": "github"
       },
       "original": {
@@ -672,14 +688,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-21_11": "nixpkgs-21_11"
+        "nixpkgs-21_11": "nixpkgs-21_11",
+        "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1653237221,
-        "narHash": "sha256-zMgangC+wDXvdAz/aP5jDg/Paw7icNFhQIZsJVACMc0=",
+        "lastModified": 1653462763,
+        "narHash": "sha256-n0beO7WNvAeEtTtnetzQCaGs615tU/DfM97k8r/7bUw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "13079f98ddfdc9e06e4b688332626ca954c14264",
+        "rev": "7385b12722ce903e477878147794bed9040227e2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9233018..4de884d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     };
     emacs = {
       url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     mozilla = {
       url = "github:mozilla/nixpkgs-mozilla";
@@ -67,6 +67,8 @@
               experimental-features = nix-command flakes
             '';
           };
+          # Setup overlays
+          nixpkgs.overlays = [ emacs.overlay ];
         })
       ];
       sopsModules = [
@@ -141,7 +143,7 @@
           specialArgs = {
             unstable = import nixpkgs-unstable {
               config = { allowUnfree = true; };
-              overlays = [ emacs.overlay mozillaOverlay polymc.overlay ];
+              overlays = [ mozillaOverlay polymc.overlay ];
               system = "x86_64-linux";
             };
             fenix = fenix.packages.x86_64-linux;
@@ -236,7 +238,7 @@
           specialArgs = {
             unstable = import nixpkgs-unstable {
               config = { allowUnfree = true; };
-              overlays = [ emacs.overlay ];
+              overlays = [ ];
               system = "x86_64-linux";
             };
             fenix = fenix.packages.x86_64-linux;
@@ -250,7 +252,7 @@
           specialArgs = {
             unstable = import nixpkgs-unstable {
               config = { allowUnfree = true; };
-              overlays = [ emacs.overlay ];
+              overlays = [ ];
               system = "x86_64-darwin";
             };
             fenix = fenix.packages.x86_64-darwin;