[NUCCORE-1192] Further commonisation of ids