diff --git a/flake.lock b/flake.lock
index 73f62380..6581ab59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1628128176,
-        "narHash": "sha256-elL6sSscr6riZ7LbwNeMXaqUJHYamrsedDs/nbq8k7E=",
+        "lastModified": 1628155445,
+        "narHash": "sha256-he4MPagRglGy5iFtZ/HRpy26ArrM43p8K0LBCMCSmYQ=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8bceeeff7c7d00aee965f0ac623db2dba5b048f3",
+        "rev": "c4d120d4776f0d17ee7128c4c3d551fab3bfc848",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index a7b60be2..ddc77dda 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -108,8 +108,15 @@
     (when window-system (set-frame-font "Fira Code 9"))
     (set-fontset-font t 'symbol "Noto Color Emoji")
     (set-fontset-font t 'symbol "Symbola" nil 'append))
+  ;; Make sure DISPLAY is set correctly in env.
+  (defun display-env-hack ()
+    "Hack DISPLAY env variable back into env."
+    (setenv "DISPLAY" ":0")
+    )
   (if (daemonp)
-      (add-hook 'server-after-make-frame-hook #'font-settings)
+      (progn
+        (add-hook 'server-after-make-frame-hook #'font-settings)
+        (add-hook 'server-after-make-frame-hook #'display-env-hack))
     (font-settings))
   )
 
diff --git a/modules/graphical/xdg/default.nix b/modules/graphical/xdg/default.nix
index 6137edc4..27bd6654 100644
--- a/modules/graphical/xdg/default.nix
+++ b/modules/graphical/xdg/default.nix
@@ -19,7 +19,7 @@
     ];
 
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = with pkgs; [ xdg-user-dirs ];
+      home.packages = with pkgs; [ xdg-user-dirs xdg_utils ];
       xdg = {
         enable = true;
         # Some applications overwrite mimeapps.list with an identical file