diff --git a/.config/guix/system/default.scm b/.config/guix/system/default.scm
index 544ade3a..c7b0b8cc 100644
--- a/.config/guix/system/default.scm
+++ b/.config/guix/system/default.scm
@@ -83,6 +83,15 @@ StrictNodes 1")
                                        (list ;; %nitrokey-udev-rule
                                         %ambrevar/cdemu-vhba-udev-rule))))))))
 
+(define-public %ambrevar/packages
+  (cons* nss-certs          ; for HTTPS access
+         ;; gvfs            ; TODO: For user mounts?
+         ntfs-3g
+         ;; exfat-utils        ; TODO: Needed for macOS drives?  Does not seem to work.
+         fuse-exfat
+         emacs-exwm
+         %base-packages))
+
 (define-public %ambrevar/firmware
   (append (list vhba-module)
           %base-firmware))
@@ -140,13 +149,7 @@ StrictNodes 1")
                    (home-directory "/home/ambrevar"))
                   %base-user-accounts))
 
-    (packages (cons* nss-certs          ; for HTTPS access
-                     ;; gvfs            ; TODO: For user mounts?
-                     ntfs-3g
-                     ;; exfat-utils        ; TODO: Needed for macOS drives?  Does not seem to work.
-                     fuse-exfat
-                     emacs-exwm
-                     %base-packages))
+    (packages %ambrevar/packages)
 
     (services %ambrevar/services)