I thought we'd merged the new DB structure in, so objects weren't prefixed with the current site id?