diff --git a/configuration.nix b/configuration.nix
index 299805a..bf8cd12 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -138,7 +138,6 @@ in {
     ./modules/printing.nix
     ./modules/periodic.nix
     ./modules/power.nix
-    ./overlays/emacs.nix
     ./overlays/nix-direnv.nix
     ./overlays/openconnect-sso.nix
     ./overlays/cyrus-sasl-oauth2.nix
diff --git a/flake.lock b/flake.lock
index 37b3464..b8c0392 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1646845404,
-        "narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=",
+        "lastModified": 1648942457,
+        "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "764c975e74bce2f89a5106b68ec48e2b586f893c",
+        "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01",
         "type": "github"
       },
       "original": {
@@ -36,28 +36,13 @@
         "type": "github"
       }
     },
-    "emacs-overlay": {
-      "locked": {
-        "lastModified": 1648549503,
-        "narHash": "sha256-FOJbdKuHAxV9TTCbKY2LRKO0SgFaMPJI5h6QfpM6YP4=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "ca681435ecff48905feb643cfa99b1112943289c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648390671,
-        "narHash": "sha256-u69opCeHUx3CsdIerD0wVSR+DjfDQjnztObqfk9Trqc=",
+        "lastModified": 1650701402,
+        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510",
+        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
         "type": "github"
       },
       "original": {
@@ -86,7 +71,6 @@
       "inputs": {
         "agenix": "agenix",
         "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
-        "emacs-overlay": "emacs-overlay",
         "nixpkgs": "nixpkgs",
         "openconnect-sso": "openconnect-sso"
       }
diff --git a/flake.nix b/flake.nix
index 412e813..e1ab727 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,6 @@
     nixpkgs.url = "nixpkgs/nixos-unstable";
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
-    emacs-overlay.url = "github:nix-community/emacs-overlay";
     openconnect-sso = {
       url = "github:vlaci/openconnect-sso";
       flake = false;
diff --git a/modules/periodic.nix b/modules/periodic.nix
index c1f3cf0..550cc6c 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -3,7 +3,7 @@
 with pkgs;
 
 let
-  emacs-vterm = ((emacsPackagesFor emacsPgtkGcc).emacsWithPackages
+  emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
     (epkgs: [ epkgs.vterm ]));
   isync-oauth2 = isync.overrideAttrs
     (div: rec { buildInputs = [ openssl patched-cyrus-sasl-oauth2 zlib ]; });
diff --git a/modules/software.nix b/modules/software.nix
index 2a46808..8a990c6 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -3,7 +3,7 @@
 with pkgs;
 
 let
-  emacs-vterm = ((emacsPackagesFor emacsPgtkGcc).emacsWithPackages
+  emacs-vterm = ((emacsPackagesFor emacs28NativeComp).emacsWithPackages
     (epkgs: [ epkgs.vterm ]));
   patched-webtorrent-cli = nodePackages.webtorrent-cli.override {
     buildInputs = [ pkgs.nodePackages.node-gyp-build ];
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
deleted file mode 100644
index 806a368..0000000
--- a/overlays/emacs.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ config, lib, pkgs, inputs, ... }: {
-  nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
-}