More ongoing changes to overlay sttructure.  Store node_ids as long instead of uuid string.