diff --git a/src/6model/reprs/P6opaque.c b/src/6model/reprs/P6opaque.c
index c90bb000fc..d893625d96 100644
--- a/src/6model/reprs/P6opaque.c
+++ b/src/6model/reprs/P6opaque.c
@@ -141,7 +141,9 @@ static void gc_free(MVMThreadContext *tc, MVMObject *obj) {
     }
 
     /* If we replaced the object body, free the replacement. */
-    MVM_free(((MVMP6opaque *)obj)->body.replaced);
+    void *replaced = ((MVMP6opaque *)obj)->body.replaced;
+    if (replaced)
+        MVM_fixed_size_free(tc, tc->instance->fsa, STABLE(obj)->size - sizeof(MVMObject), replaced);
 }
 
 /* Marks the representation data in an STable.*/
@@ -1241,18 +1243,17 @@ static void allocate_replaced_body(MVMThreadContext *tc, MVMObject *obj, MVMSTab
 
     /* Allocate new memory. */
     size_t  new_size = new_type->size - sizeof(MVMObject);
-    void   *new = MVM_malloc(new_size);
-    memset((char *)new + (STABLE(obj)->size - sizeof(MVMObject)),
-        0, new_size - (STABLE(obj)->size - sizeof(MVMObject)));
+    size_t  old_size = STABLE(obj)->size - sizeof(MVMObject);
+    void   *new = MVM_fixed_size_alloc_zeroed(tc, tc->instance->fsa, new_size);
 
     /* Copy existing to new.
      * XXX Need more care here, as may have to re-barrier pointers. */
-    memcpy(new, old, STABLE(obj)->size - sizeof(MVMObject));
+    memcpy(new, old, old_size);
 
     /* Pointer switch, taking care of existing body issues. */
     if (body->replaced) {
         body->replaced = new;
-        MVM_free(old);
+        MVM_fixed_size_free_at_safepoint(tc, tc->instance->fsa, old_size, old);
     }
     else {
         body->replaced = new;