diff --git a/Makefile b/Makefile
index 041ca8d811c71d2a71ec225868cc22f5a7bd1b22..0938611de01dbd546008a1c82981cd21e5c26887 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ SHELL=zsh -f --null-glob
 
 ### Here, the XCVB way of building exscribe:
 # You need to export a proper XCVB_PATH and that's all.
-XCVB_OBJECT_DIRECTORY := /tmp/fare/exscribe-obj
+XCVB_WORKSPACE := /tmp/${USER}/exscribe-workspace
 
 ${INSTALL_BIN}/exscribe: install
 install: install-with-xcvb
@@ -36,10 +36,11 @@ install: install-with-xcvb
 
 # How to build it with XCVB:
 install-with-xcvb:
+	mkdir -p ${XCVB_WORKSPACE}
 	xcvb mkmk --build /exscribe --setup /exscribe/setup \
-		--object-directory ${XCVB_OBJECT_DIRECTORY}
-	make -f xcvb.mk -j || XCVB_DEBUGGING=t make -f xcvb.mk
-	cl-launch --image ${XCVB_OBJECT_DIRECTORY}/fare.tunes.org/exscribe.image \
+		--lisp-implementation sbcl --workspace ${XCVB_WORKSPACE}
+	make -f ${XCVB_WORKSPACE}/xcvb.mk -j || XCVB_DEBUGGING=t make -f xcvb.mk
+	cl-launch --image ${XCVB_OBJECT_CACHE}/fare.tunes.org/exscribe.image \
 		--restart exscribe::main \
 		--output ${INSTALL_BIN}/exscribe \
 		${DUMP}