diff --git a/flake.lock b/flake.lock
index bd7a06f..388f6db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714852682,
-        "narHash": "sha256-JcMj7oCJ9IuquBoPmMgxLQNPcWB+GZ9oWiW9otgeX4E=",
+        "lastModified": 1714853356,
+        "narHash": "sha256-2I7uFSeTAF0b8MU+Apb2JoczlAYmEAxj+ke/eWe1boA=",
         "ref": "refs/heads/master",
-        "rev": "116b93e52a97d4922f086b004fa9e8043ba8931c",
-        "revCount": 48,
+        "rev": "a25078b1c1afd3fd887042ac8187bd9b300a6e83",
+        "revCount": 51,
         "type": "git",
         "url": "https://git.syzygial.cc/Syzygial/EmacsConfig.git"
       },
diff --git a/flake.nix b/flake.nix
index 7610540..177277d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,39 +30,37 @@
     nixpkgsConfig = {
       config = { allowUnfree = true; };
     };
-    me-emacs-overlay = (final: prev: {
-      me-emacs = me-emacs.packages."x86_64-linux".emacs;
-      # Will in future be macports based
-      mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
-    });
+    me-emacs-overlay = me-emacs.overlays.default;
 
     pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
     pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
 
   in {
-    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = attrs;
-      modules =
-        [
-          ({ config, pkgs, ... }: {
-            nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
-          })
-          ./machines/hippocampus/configuration.nix
-          sops-nix.nixosModules.sops
-        ];
-    };    
-    nixosConfigurations.universedesktop = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = attrs;
-      modules =
-        [
-          ({ config, pkgs, ... }: {
-            nixpkgs.overlays = [ me-emacs-overlay ];
-          })
-          ./machines/universedesktop/configuration.nix
-          sops-nix.nixosModules.sops
-        ];
+    nixosConfigurations = {
+      nixos = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = attrs;
+        modules =
+          [
+            ({ config, pkgs, ... }: {
+              nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
+            })
+            ./machines/hippocampus/configuration.nix
+            sops-nix.nixosModules.sops
+          ];
+      };
+      universedesktop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = attrs;
+        modules =
+          [
+            ({ config, pkgs, ... }: {
+              nixpkgs.overlays = [ me-emacs-overlay ];
+            })
+            ./machines/universedesktop/configuration.nix
+            sops-nix.nixosModules.sops
+          ];
+      };
     };
     darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
       system = "aarch64-darwin";
diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 90409c8..1afd4b8 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -52,11 +52,12 @@ in
     services.emacs = {
       # Emacsclient behaving weirdly
       # enable = true;
-      package = pkgs.mac-emacs;
+      package = pkgs.me-emacs;
     };
 
     environment.variables = {
-      EDITOR = "emacs";
+      EDITOR = "emacs -nw";
+      VISUAL = "emacs";
     };
 
     environment.systemPackages = (with pkgs; [