Remap block ids