diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 8c08868456d7..aeda34c3acff 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -344,7 +344,7 @@ acpi_cmbat_get_bix(void *arg)
     bix_buffer.Pointer = NULL;
     bix_buffer.Length = ACPI_ALLOCATE_BUFFER;
 
-    for (n = 0; n < sizeof(bobjs); n++) {
+    for (n = 0; n < nitems(bobjs); n++) {
 	as = AcpiEvaluateObject(h, bobjs[n].name, NULL, &bix_buffer);
 	if (!ACPI_FAILURE(as)) {
 	    res = (ACPI_OBJECT *)bix_buffer.Pointer;
@@ -355,7 +355,7 @@ acpi_cmbat_get_bix(void *arg)
         bix_buffer.Length = ACPI_ALLOCATE_BUFFER;
     }
     /* Both _BIF and _BIX were not found. */
-    if (n == sizeof(bobjs)) {
+    if (n == nitems(bobjs)) {
 	ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
 	    "error fetching current battery info -- %s\n",
 	    AcpiFormatException(as));