Gather builderid for builders

This replaces a fake "-1" for builderid.