diff --git a/src/ikarus.boot b/src/ikarus.boot
index e524a8b..3774058 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/ikarus.code-objects.ss b/src/ikarus.code-objects.ss
index 3651311..a259720 100644
--- a/src/ikarus.code-objects.ss
+++ b/src/ikarus.code-objects.ss
@@ -4,9 +4,8 @@
     make-code code? code-reloc-vector code-freevars
     code-size code-ref code-set! set-code-reloc-vector!)
   (import
-    (only (scheme) $fx< $fx>= 
-          $code? $code-reloc-vector $code-freevars $code-size
-          $code-ref $code-set! )
+    (ikarus system $fx)
+    (ikarus system $codes)
     (except (ikarus) make-code code? code-reloc-vector code-freevars
             code-size code-ref code-set! set-code-reloc-vector!))