diff --git a/pkgs/image/mkimage.sh b/pkgs/image/mkimage.sh
index 52a3b60..ad7d57d 100644
--- a/pkgs/image/mkimage.sh
+++ b/pkgs/image/mkimage.sh
@@ -40,16 +40,8 @@ ln -sf ../systemd-timesyncd.service rootfs/usr/lib/systemd/system/multi-user.tar
 # enable default network config
 mv rootfs/usr/lib/systemd/network/89-ethernet.network.example rootfs/usr/lib/systemd/network/89-ethernet.network
 
-# FIXME: remove this! machine id should be setup by a confext instead?
-mkdir rootfs/usr/lib/systemd/system/systemd-machine-id-commit.service.d
-cat <<EOF > rootfs/usr/lib/systemd/system/systemd-machine-id-commit.service.d/override.conf
-[Unit]
-After=local-fs.target sysroot-etc.mount
-ConditionPathIsMountPoint=
-[Service]
-ExecStart=
-ExecStart=systemd-machine-id-setup
-EOF
+#FIXME: generate a temporary machine id (replace with overlay/confext later?)
+$systemd/usr/bin/systemd-machine-id-setup --root=rootfs/
 
 # install sys users
 mkdir creds