Add Block.id, complete block_id_to_index lookup when manipulating blocks