diff --git a/common/config/packages.nix b/common/config/packages.nix
index 4f992bf..629fc50 100644
--- a/common/config/packages.nix
+++ b/common/config/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, emacs-overlay, ... }:
 let
   # nix-direnv with flake support
   nix-direnv-with-flakes = pkgs.nix-direnv.override { enableFlakes = true; };
@@ -25,7 +25,6 @@ in {
     slurp
     imv
 
-    emacs28
     direnv
     nix-direnv-with-flakes
   ];
@@ -37,6 +36,10 @@ in {
   services.gnome.gnome-keyring.enable = true;
 
 
+  nixpkgs.overlays = [ emacs-overlay.overlay ];
+  services.emacs.enable = true;
+  services.emacs.package = pkgs.emacsUnstable;
+
   # direnv setup
 
   nix.extraOptions = ''
diff --git a/common/home-manager/default.nix b/common/home-manager/default.nix
index 775a682..b101fb4 100644
--- a/common/home-manager/default.nix
+++ b/common/home-manager/default.nix
@@ -3,7 +3,7 @@
   home.username = username;
   home.homeDirectory = "/home/" + username;
 
-  imports = [ ./shell ./wayland ./spacemacs.nix ];
+  imports = [ ./shell ./wayland ];
 
   xdg.enable = true;
   xdg.userDirs.enable = true;
diff --git a/common/home-manager/spacemacs.nix b/common/home-manager/spacemacs.nix
deleted file mode 100644
index 7f6e593..0000000
--- a/common/home-manager/spacemacs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, spacemacs, ... }:
-{
-  # Set up spacemacs using local emacs config
-
-  home.file.".emacs.d" = {
-    recursive = true;
-    source = spacemacs;
-  };
-}
-
diff --git a/flake.nix b/flake.nix
index cfeba8d..6c5ce9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,8 +8,7 @@ inputs = rec {
   home-manager.url = "github:nix-community/home-manager/master";
   home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-  spacemacs.url = "github:syl20bnr/spacemacs/develop";
-  spacemacs.flake = false;
+  emacs-overlay.url = "github:nix-community/emacs-overlay";
 };
 outputs = { self,
             nixpkgs,