diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm
index 07c5458..fbf73ba 100644
--- a/oni/home/services/emacs.scm
+++ b/oni/home/services/emacs.scm
@@ -1,11 +1,21 @@
 (define-module (oni home services emacs)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu packages emacs)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services shepherd)
-  #:use-module (gnu home services utils)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
+  #:use-module ((gnu services configuration)
+                #:select (serialize-package
+                          define-configuration))
+  #:use-module ((gnu packages emacs)
+                #:select (emacs))
+  #:use-module ((gnu home services)
+                #:select (service-type
+                          service-extension
+                          home-profile-service-type))
+  #:use-module ((gnu home services shepherd)
+                #:select (shepherd-service
+                          home-shepherd-service-type))
+  #:use-module ((guix gexp)
+                #:select (gexp
+                          file-append))
+  #:use-module ((guix packages)
+                #:select (package?))
 
   #:export (home-emacs-service-type
             home-emacs-configuration))