diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index cfa33c6..5d8958b 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -66,8 +66,6 @@
 			      "init.el"
 			      "(with-eval-after-load 'project (require 'oni-project))\n"
                   "(require 'oni-gui)\n"
-			      "(setq custom-file \"~/.config/emacs/custom.el\")\n"
-			      "(load custom-file :noerror)\n"
 			      "(provide 'init)\n"
 			      ";;; init.el ends here\n")))))
 		 (service home-wakatime-service-type
diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm
index 76856a5..c698301 100644
--- a/oni/home/services/emacs.scm
+++ b/oni/home/services/emacs.scm
@@ -95,6 +95,9 @@
 (define (serialize-list-of-strings field value)
   (string-append "    " (string-join value "\n    ")))
 
+(define (serialize-string field value)
+  "")
+
 ;;; Emacs
 
 (define-configuration/no-serialization home-emacs-extension
@@ -106,6 +109,9 @@
   (package
     (package emacs)
     "Package to use for setting Emacs")
+  (custom-file
+   (string "config.el")
+   "Location of the Custom file where customization settings are stored.")
   (configurations
    (text-config '())
    "A list of other configuration files to autoload"))
@@ -137,7 +143,10 @@
   `((".emacs.d/init.el"
      ,(mixed-text-file
        "init.el"
-       (serialize-text-config config (home-emacs-configuration-configurations config))))))
+       (serialize-text-config config (home-emacs-configuration-configurations config))
+       (format #f "(setq custom-file (expand-file-name ~s user-emacs-directory))~%"
+               (home-emacs-configuration-custom-file config))
+       "(load custom-file :noerror)\n"))))
 
 (define home-emacs-service-type
   (service-type