diff --git a/src/dxtbx/format/nxmx_writer.py b/src/dxtbx/format/nxmx_writer.py
index 58e705484..96adca876 100644
--- a/src/dxtbx/format/nxmx_writer.py
+++ b/src/dxtbx/format/nxmx_writer.py
@@ -21,11 +21,12 @@
 from libtbx.utils import Sorry
 from scitbx import matrix
 from scitbx.array_family import flex
-from xfel.cftbx.detector.cspad_cbf_tbx import angle_and_axis, basis
+from serialtbx.detector import basis
 
 from dials.util.options import ArgumentParser, flatten_experiments
 
 from dxtbx import flumpy
+from dxtbx.format.FormatCBFMultiTile import angle_and_axis
 
 help_message = """
 Create a NeXus file from either an experiment list or a set of image files
@@ -724,7 +725,6 @@ def append_frame(self, index=None, data=None):
 
     def add_scan_and_gonio(self, scan=None, gonio=None):
         if scan is None or gonio is None:
-
             assert scan is None and gonio is None
             scan = self.scan
             gonio = self.goniometer