diff --git a/fschl/systems/base.scm b/fschl/systems/base.scm
index 9a97763..82cd4b3 100644
--- a/fschl/systems/base.scm
+++ b/fschl/systems/base.scm
@@ -10,12 +10,13 @@
 (use-service-modules guix admin sysctl pm nix avahi dbus cups desktop linux
                      mcron networking xorg ssh docker audio virtualization)
 
-(use-package-modules nfs certs shells ssh linux bash emacs gnome networking wm fonts libusb
-                     cups freedesktop file-systems version-control package-management)
+(use-package-modules audio video nfs certs shells ssh linux bash emacs gnome
+                     networking wm fonts libusb cups freedesktop file-systems
+                     version-control package-management vim)
 
 (define-public base-operating-system
   (operating-system
-   (host-name "default-placeholder")
+   (host-name "default")
    (timezone "Europe/Berlin")
    (locale "en_US.utf8")
 
@@ -80,23 +81,20 @@
                  %base-groups))
 
    ;; Install bare-minimum system packages
-   (packages (append (map specification->package
-                          '("bluez"
-                            "bluez-alsa"
-                            "brightnessctl"
-                            "btrfs-progs"
-                            "emacs-no-x-toolkit"
-                            "exfat-utils"
-                            "fuse-exfat"
-                            "git"
-                            "gvfs"    ;; Enable user mounts
-                            "intel-vaapi-driver"
-                            "libva-utils"
-                            "nss-certs" ;; SSL root certificates
-                            "ntfs-3g"
-                            "vim"
-                            "xf86-input-libinput"))
-                     %base-packages))
+   (packages (cons* bluez
+                    bluez-alsa
+                    brightnessctl
+                    emacs-no-x-toolkit
+                    exfat-utils
+                    fuse-exfat
+                    git
+                    gvfs    ;; Enable user mounts
+                    intel-media-driver/nonfree
+                    libva-utils
+                    ntfs-3g
+                    stow
+                    vim
+                    %base-packages))
 
    ;; Configure only the services necessary to run the system
    (services (append